Merge changes from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Sat, 19 Mar 2011 18:50:29 +0000 (14:50 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 19 Mar 2011 18:50:29 +0000 (14:50 -0400)
commitc61069da7f41b2de07d316d6e36e8246abb5370b
treeb1512a10f215797f4e08d52956adf60a42338cbe
parent7e5028e69afae62ded8173f4a47732fd242273de
parentbc90136d81db5178a86c84d70c31aa16f47db995
Merge changes from emacs-23 branch